Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Feb 2007 15:37:28 +0000 (15:37 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Feb 2007 15:37:28 +0000 (15:37 +0000)

Trivial merge